From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 15 Jan 2015 11:22:27 +0000 (+0000)
Subject: xen: arm: enable sync console in machine_reboot.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3846
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=2d61819c0b313ff7c8c0eedbe02d9d0197a7f57a;p=xen.git

xen: arm: enable sync console in machine_reboot.

Otherwise the last thing printed is "(XE" or something.

In line with x86 also disable the watchdog and spin debugging.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Julien Grall <julien.grall@linaro.org>
---

diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
index 4988b03fc4..e53ec975bf 100644
--- a/xen/arch/arm/shutdown.c
+++ b/xen/arch/arm/shutdown.c
@@ -38,6 +38,10 @@ void machine_restart(unsigned int delay_millisecs)
 {
     int timeout = 10;
 
+    watchdog_disable();
+    console_start_sync();
+    spin_debug_disable();
+
     local_irq_enable();
     smp_call_function(halt_this_cpu, NULL, 0);
     local_irq_disable();